Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upstream Sync #44

Merged
merged 1,083 commits into from
Jan 28, 2024
Merged

Upstream Sync #44

merged 1,083 commits into from
Jan 28, 2024

Conversation

DEATHB4DEFEAT
Copy link
Member

@DEATHB4DEFEAT DEATHB4DEFEAT commented Jan 28, 2024

Description

This would cause so many merge conflicts if we had so many PRs open..

TODO

  • Animate the spine markings with the tailwag
  • Use our tailwag sprites
  • Fix longmeme_wagging sprite
  • Finally use the states of wings (in another PR)

Media

2024-01-27_18-13-15.mp4

metalgearsloth and others added 30 commits January 26, 2024 23:07
* Rework wheelchairbound

Fixes the save/load bug and fixes it being a singleton.

* weh

(cherry picked from commit 243491dd596ffad3698d1d00a645195f2224386f)
* add

* needs space for salt

(cherry picked from commit 8cc24c9a5d6de080067fe35a46d7d69d54b20a28)
Change the station map tracking dot color to cyan

Co-authored-by: iacore <[email protected]>
(cherry picked from commit c35b9964c770714f5ba56fce827912cd33312fe6)
* Restarts have max player count

* Now counts ingame ghosts to determine if restart can be called

* consistant cvar name

* Added a player count with state conditional

(cherry picked from commit 7bf62f1d1904b591580b17b2b5079f0dfe769e4b)
(cherry picked from commit 217e8658f00cb8c147797a4e0dcf223a18ede227)
I thought we had it already but maybe it was an unfinished pr or something.

(cherry picked from commit ad23facb7a9670bcc10e2f9e89d2e22db2052697)
(cherry picked from commit 8aeeacce9719f08b5d24cc1854f28ad4f1df2619)
Deleting non-predicted entities moment.

(cherry picked from commit b535909a4983919b4764c72f7409d881cea02ae8)
(cherry picked from commit 95815c7f2b8e949e1cde3991786b9d3d28109966)
* fix

* blocky

* glowier

* darker

(cherry picked from commit e3d5dc4d76908cb1da4d71187f7cc77ac146eb68)
SEEDS MAN

(cherry picked from commit bdb1399ada20dfe7638ce7af1727192e6d9de17f)
* Various sounds ported

* Replace wall_bonk.ogg

* Metal/metalglass break sound pass

* Replace metalbreak.ogg

* Replace woodhit

* Replcae tap.ogg n some smack uses

* Fix lint

* Replace bang.ogg and some instances of hit_kick.ogg

* couple more

* fix wood sound

* i may be stupid

* le attributing

* bro what

* standardize more destruction sounds

* fix melee hit sound cutting off

* window threshold sounds and remove `destroySound` it literally doesnt exist

(cherry picked from commit 818b07ecf82bdd72dc5524f6bc093067b2ef6472)
(cherry picked from commit 884c866e4d446cce0f5f4c5db0886a33823891a3)
* initial commit

* made it emaggable

* removed OnAttemptEmagEvent

* moved emagging to shared

* added local file to git

(cherry picked from commit fd673cf6e30599f5895d58c3281eba2901301401)
(cherry picked from commit f44661c82a5b95226c4bd3d008b55ecd173ad79e)
* Adds more grindables

* fuc

* A

(cherry picked from commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db)
add

(cherry picked from commit 08c7386074b2da46ace4e4f12cdf65782f37089d)
add

(cherry picked from commit a6e16d99610120d086105de867d7e82712964109)
* Lathe Categories

* serilog my beloathed

(cherry picked from commit 73e94dfa92e0afe3ad0decd1d7248d13fa4f208c)
(cherry picked from commit ac809c492990746b67e948a30ec36542679084e1)
* unrevivable trait + remove unclonable remnants

* cleanup

* change to hascomp

(cherry picked from commit 7a2e500f689738b64abc24929e8d4a387749ba64)
(cherry picked from commit f33a3f98cde0c6c833ebce2402902eb3a77efbcb)
* Added animations for opening toolboxes

* Fix cow toolbox

(cherry picked from commit f71df97b5eebbe1224c9a4d203e0a6b3bbeca3c7)
(cherry picked from commit df768b289e7ece83f146b1932eddc2a78eb9579b)
This reverts commit 16a1f2f16a8549d538c7523f5abefea63c7ad3db.

(cherry picked from commit 34806400bd3fd3cf4ef30333eb3eb64770026982)
* Rebalance of Lobbying bundle

- More money, mickey (5000 -> 30000)
- Added trader`s rubberstump for high iq players
- Phone to call upper managment
- Some fancy and absolutely unsuspicious clothings
- Patriotic Flag for the most valuable lobist of Syndicate

* Thief problem fix

Thief now have have separate lobbying bundle, now it calls bribing bundle

* Fixing

Money count, suffix

* Hi

Fixing money

(cherry picked from commit 559ff13a121ee1a79bf6d59e427d9c0fc93ec9a1)
(cherry picked from commit 91e8234a574d33124aae96ac0d28b34db4e66bde)
…er (#24253)

* Prevent EntityStorages from being opened while inside a mech.

* compressed into few lines

* unneeded line

* Popup client

---------

Co-authored-by: metalgearsloth <[email protected]>
(cherry picked from commit e89be95d4c3085d7d6d08ad5aafa942cfc32c934)
(cherry picked from commit a65e3eeb8fdbecbc02731f8a1b1d6d4fb1f2b837)
Might fix the test failure

(cherry picked from commit ed2fa96ca024df553b2559632ba923e8e51d443e)
Hanzdegloker and others added 12 commits January 28, 2024 00:33
Fixed up bartending after the limited reagents update

(cherry picked from commit 8fc9650b6e2cd9dbfb1fd05d731c2fad3e0b8165)
Fixes space-wizards/space-station-14#24574

Moved back view sprite one pixel to the right.

(cherry picked from commit a8989c0ee75a2e102afc432b1b37bdfcec784e07)
(cherry picked from commit 7b046aceb8cef4a314682ea7ba374489227f057d)
(cherry picked from commit dfa10be890f7f8b10f0085b8e5bba729d1ba7cb5)
# Conflicts:
#	Resources/Maps/hammurabi.yml
why aren't we using JSONC :((((
@DEATHB4DEFEAT DEATHB4DEFEAT added Priority: 1-Urgent Must be resolved immediately Size: 1-Very Large For especially large issues/PRs labels Jan 28, 2024
Copy link
Contributor

github-actions bot commented Jan 28, 2024

RSI Diff Bot; head commit 7459706 merging into cd9ecea
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:
Edit: diff updated after 7459706

@github-actions github-actions bot added Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files labels Jan 28, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT marked this pull request as ready for review January 28, 2024 02:22
@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jan 28, 2024
@DEATHB4DEFEAT DEATHB4DEFEAT merged commit faa2072 into master Jan 28, 2024
21 of 22 checks passed
@DEATHB4DEFEAT DEATHB4DEFEAT deleted the upstream-sync-3 branch January 28, 2024 02:32
DEATHB4DEFEAT added a commit that referenced this pull request Mar 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: C# Changes any cs files Changes: Documentation Changes any xml or md files Changes: Localization Changes any ftl files Changes: Map Changes any yml file in the Maps directories Changes: Sprite Changes any png or json in an rsi Changes: UI Changes any XAML files Priority: 1-Urgent Must be resolved immediately Size: 1-Very Large For especially large issues/PRs Status: Needs Review Someone please review this
Projects
None yet
Development

Successfully merging this pull request may close these issues.